menu: Remove have_position flag

It's always FALSE.

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 700ec5f36bd337d2debd4d0f835c935e9cdf4e8e..ffcc815387a3c196232f45321dc6c52169b94af8 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -2030,8 +2030,6 @@ gtk_menu_popdown (GtkMenu *menu)
   menu_shell->priv->active = FALSE;
   menu_shell->priv->ignore_enter = FALSE;
 
-  priv->have_position = FALSE;
-
   gtk_menu_stop_scrolling (menu);
   gtk_menu_stop_navigating_submenu (menu);
 
@@ -2765,32 +2763,6 @@ static void gtk_menu_measure (GtkWidget      *widget,
           single_height += arrow_border.top + arrow_border.bottom;
           min_height = MIN (min_height, single_height);
 
-          if (priv->have_position)
-            {
-              GdkDisplay *display;
-              GdkMonitor *monitor;
-              GdkRectangle workarea;
-              GtkBorder border;
-
-              display = gtk_widget_get_display (priv->toplevel);
-              monitor = gdk_display_get_monitor (display, priv->monitor_num);
-              gdk_monitor_get_workarea (monitor, &workarea);
-
-              if (priv->position_y + min_height > workarea.y + workarea.height)
-                min_height = workarea.y + workarea.height - priv->position_y;
-
-              if (priv->position_y + nat_height > workarea.y + workarea.height)
-                nat_height = workarea.y + workarea.height - priv->position_y;
-
-              _gtk_window_get_shadow_width (GTK_WINDOW (priv->toplevel), &border);
-
-              if (priv->position_y + border.top < workarea.y)
-                {
-                  min_height -= workarea.y - (priv->position_y + border.top);
-                  nat_height -= workarea.y - (priv->position_y + border.top);
-                }
-            }
-
           *minimum = min_height;
           *natural = nat_height;
 

diff --git a/gtk/gtkmenuprivate.h b/gtk/gtkmenuprivate.h
index 5a24b4a4652230b20eed1b30cca0dcbb552b858f..7507cb788697b28aa8d1912aec45c9002ebc95b9 100644 (file)
--- a/gtk/gtkmenuprivate.h
+++ b/gtk/gtkmenuprivate.h
@@ -88,7 +88,6 @@ struct _GtkMenuPrivate
   guint upper_arrow_prelight  : 1;
   guint lower_arrow_prelight  : 1;
 
-  guint have_position         : 1;
   guint have_layout           : 1;
   guint seen_item_enter       : 1;
   guint ignore_button_release : 1;